starting to upgrade all the codes