added complete toggle support