switched back to non-debug code base