Merged in Quynh and Irit's suggestions