Implement additional columns in Style, calculations
Merge branch 'death'