Changes, see comments in previous commit