Added more logging!