Added the rest of the class