changed class attribute location/order