tidy up
tighter prior for i==2