now really ready to merge