Made some changes simultaiously

We can discuss this code, after which we can merge what we'd like to
merge.