Change methods back to class methods