Changes as per Asaf's instructions