This could be done in the previous loop?