updates old code
updates old code and merge