To-do: 9.6.4. Finished 9.6.5. Starting 9.6.6