Updated based of review feedback.