getting redy to merge
more updates