another change to improve it n get all