Ready to be tested everywhere.
removed some debug code.