changes from 1.8 to 2.0