Sync commit
Some changes.
Even more changes.