Hannes fix +edits