2.1.1, Hybrid stats un-split
Fixed merge problems, because I didn't pull correctly