Modified 3.1
Modifications up to 3.2