Updated with versions from hoolock
