removed toggle_flag - not ready yet