Little changes to startnig logic