Adding echo lines to help diagnose