Hot fix1

Hotfix1a is complete