Commented out dale's debug code