Changes from C. Titus Brown.