more logging added