A revised version of Hummingbird