Updating code to use Lock 6.0.