Perhaps eliminate toggle switch