Brett - adding class checking