Fixing up Josh's comments