Implementation for enhancement #26