added menu and flagchecker
fix merge