new files and swift conversion