Performance improving
Minor changes