Added some features and stuff