Changes flow to match design