Implementation for enhancement #9