refactor from Violations Report build 7