Improved debug!