Client Side changes