Adding more debuging