Re-rolled patch #3, Please review.