Added additional lines from Cindy Ng