more changes

r-tested works