made more code changes

made more code changes