Syncing up code with the "quickstart".