added some more UI flow conditions