Removed Class addition, made it its own method