I would like to suggest not limiting the number of workers that are working on an upgrade. Make it such that the more workers, the faster the upgrade.