Minor modifications per Yunsai's email