Updating based on Steve's feedback