improve past version support