AI-684 trying to improve advisory lock code