Added more logging stuff