rewrote toggle/val