Merge with parts of Hannes