ENH:  Added enhancments.