more changes .etc