Restored header, removed unecessery argument in run functions