Added more debuging