updating with Patrick's comments