work on shapes and menu state
work on shapes and menu state