reverting to old code. much better
fixed
Merge branch 'revert'