add changes to upgrade 3.7