updated for new version of Swift