Address Brian and Dolphin's comments