fix class method, lots of work to do, need sleep