fixed integration with 2 versions