- cleaned up my last_menu patch a bit more