update device flow, feedback and new flow
merge code