Implementation for enhancement #5