Adds check toggling and field cleaning