Here comes the final patch. Please review.