next to last update before merges from Tatjana