address more changes