Bug Fix and Performance Improved!