Converted to a class