Had some weird merge problems with lockedBy code. Fixed now