some improvements to feature