Chapter 260 - Clean up and expand