zaj6 almost done