Enhancement #2 implementation