Added some new tricks