Got rid of per rule factories.. unneccessarily fine