Added logic to SawGroup control