Update for swift b6