Doug's 2nd patch