Debug code put back in