finally done with class tho #2003