Added toggle switch