server updates
complete merge