load of changes - discard seems to work and propagate properly now