Changed instantiation from self to static