changes for new swift