Added more tracking