ASST 1.5 commit, missing working locks