Added code for having server reflect changes on client UNTESTED