Replaced some debugging stuff