refactor for e9
Merge branch 'master' of https://github.com/github-tn/sharedThings