Changes based on Aaron's feedback