improved client server sync