CFY-1363 uncomment debug stuff