Incorporating Josh's comments