updated (menu still incomplete) version