Added stuff for debugging