some tested changes