Incorporated feedback from Peng and Tiru