merged and tested