further updates tested in branches