upgrading to havana, work in progress