rework on boostrap setup