updated class order ( not final / testing in progress )