Havana with Marcus's corrections