added an enhancement and a feature