Changes based on Trey's suggestions