Putting some debug back in