diff from 146u2

patch would not complete because some differences in the code, but works like a charm now