Added more debugging stuff