Could we only do this if the classes have changed?