Updated to latest swift