First working version of commute update.