Added a toggle feature