merge in version 2