Changes from Johannes.