More changes

(check prev. commit)