added suggestions from Julie Ng