removed
committing Erik's work
conflict resolved