Changes for Helion EE v1.0.1 - hardly tested ... WARNING