Incorporating changes needed for boot stap