shuffle stuff, remove setup_flow