Adding more logging
Adding more logging