Incorporated Irit's suggestions into response