more changes

code changes