Merging CarKenner's and Main Dolphin Updates