more changes as above