Changes in the theory - intensity based weights included.