adding robustly and some more logging