New lockdown system to have only 2 quarantine classifications