fix code to fit havana