Added some new features