Fix toggle stuff; so much simpler