Update with Johan changes