Applied Boaz's feedback.