Incorporated some of Jimmy's comments