whoops here are all the changes for finished locks and conditions now