starting to upgrade this shit to the newest version