Rework on bootstrapped starting point