This debug code still need to be here?