class needs applying more widely