adapt to 2.0