Added more debug stuff