changed client side server changing logic