Add lock and optional red/blue swap