changed some of the ordering