Updating with Matt's changes

updating matt's changes