Incorporate Amanda's feedback