@andymckay: I'm not sure if this is much of an improvement?