Merge in advanced stats stuff