merging
Better emulation of the server