Added more debug points.