Update to the newest version with structure clear up