Updates and some new swift code