added suport for adding and removing toggles