rearranging the class names sucka