Merged bootstrap into shell