Add assaf's recommendation