removed unused class
switched classes around