Added more logging and  event