Client-side changes