745 redefine form flow

same as above