Changed to make the menu works