Implementation for enhancement #27