cutting refactor to havana