rebecca jp: second edit