Added some new things