Added currently_selected_shape