merged client and server changes
merged client and server changes

projectSHAI/GOAT-stack,projectSHAI/GOAT-stack,projectSHAI/GOAT-stack,projectSHAI/GOAT-stack,projectSHAI/GOATstack,projectSHAI/GOATstack,projectSHAI/GOATstack,projectSHAI/GOATstack