some more ongoing changes