Added resolveMenu()