improved model lock mechanism