second commit-add more features