Changes based on Rick's feedback