LAI 5 - minor flow tweaks