Added flow to prevent overlap