newest code in common with rosewright