some changes and reduced the features