Changes from 2.0