new changes for new version 2