Phase2 gem01

Customization due to Sven