rearange and add server