Updates from 2.0