Address Katya's comments