added class method back in