modified for menu changes