Improved Switch & Toggle