swift modif wip