added some more code changes