My changes

The diffs are a bit messy, sorry about that. I think we have whitespace conflicts.