Improvement: isCompleted and isOnTime done