Got rid of agreement & fixed EOL dump