Added more tracking/log