Changed the way the class is instantiated