changed some ordering