Updates to pass tests and work with MENU