changed deps
lots of modifications