EmirH/AaronJ: completed full flow