some more changes without testing