Changes based on Simon's feedback