Updates with David's markup