almost done oren's part