Warning - Upgrade from 1.7 to 2.0 Has critical defects for some - I reverted to 1.7