Chapter 521 - Swift Improvements