Merge branch 'simpler'

Reduced the code by half or more.