Upgrading to new swift