updated down/upgrade logic to accomodate new locking modes