Added some GREAT features