Updated with David's text