Updated next/back flow