added a few more features