performance improvements
removed debug