Changes based on Patrick's comments