Made updates after getting feedback from Ryan N