Incorporated Joey's comments on first draft