Added some awesome stuffs