more moving around and reordering