made all changes, updated swift helper