Changed flow processing to always be user controlled