Makes changes based on Ricky's feedback