Changed the name of class + fixed bugs