added differentiation between client and server-side changes