Some re-arrangement