Added new summary stats
Fixed conflicts