Minor Improvement!