added temporary debug mode support