removed DEBUG mode