made some more changes ...