Updated 2.1, simple vs adv pitch model