Made changes to catch up to the class