some more changes ...