getting few more features to work