REF: added more logging