Schedule needs a revamp