updates based on Stephen's feedback