rework of bootstrap dependancies