Implemented toggle feature