reverted changes manually
Merge branch 'master' into dave
removed smart.all