Incorporated comments from Raddick