Major Updates for better performance