Major Fixes To improve performance