further changed to menu builder