bootstrap added and restructed a bit