Pain driven improvements