Added debugging stuff
Merged