Improve completion status