full switch to 2.0