Updating to John's state

Trying to solve eternal conflicts…