enhancements
Starting ch 16