simplified
trimmed
Merge branch 'engine'