merged and tested on yarn