Updated to reflect device flow approach