Boot strap changes
Commit with many changes