rework for hanna