more lock changes to minimize held time