changed order of class and import