Made program faster