added hana's changes