Incorporated comments from Fortson