Added more logging to help debug