Better sync with the client