incorporate Mandy Chung's changes
current Mandy Chung's proposal