re-arranged services