more features and refining