Now do all of this in one commit:
Added disable/enable