Converted all them to class methods