Updates to mechanics and syncing