making some more changes