Added some features (untested)