corrections to meet 2.0 api