Final commit for the class