Debug improved