Incorporated Joe's changes.