Attending flow tweaks