Merged new version