Upgraded from 3.30 to 3.40