#22 Modify for presentation.