move setupLocks back, to make diff look smaller