more swift migration