Huge improvement & Optimization again.