refactoring, change menu lock while tracking