initial multi use version
Bugfix for some references & arguments