Added some awesome stuff