Add bootstrap, added some new functions