Awesome update

Pull  this awesome code!