Added some cool features