debug improved