Changes following feedback from stof