My setup, upgraded just before a second lockdown.