some features
some changes