Last round of review and revise