beta version
removed debug code