Further tweaks for debugging and do singe call for processing.