Switched to class methods