added bootstrap and stop using zenaida's copy of it