some small changes in order of items