Changes based off of feedback