Added a couple more features