Updated Arifah's part