More correct progress tracking