Code

Made current main base set up more early