DEBUG mode added