Commit on 10-4-13 before going to trip sync