more updates to new Swift