Homework 08 enhancements