reverting / reopening issue 73
merging diffs