Added "neil's" improvments.