HW4: Merge with alireza.