Use new units and suspend lock