more changes
and others