changed class order