First working client-side changes