moved old code zu old
removed warnings