Added more debug stuffs