Upgrade with latest comments