Backed out to working selector
More on TB
Merge branch 'master' of https://github.com/benjambj/TFE4140