integrating with version 2.0