added toggle feature