modify the implementation about waiver
modify menus
add session to controller