Feature/update bootstrap

round 2