adding props.data
allow for data prop
Merge branch 'master' into recover-refactor