working on more features