conditional menu logic added - second pass