changed methods from static to class methods