integrated everyone's work( almost )