Added varaiblity mechanisms in 3.1 and 3.6