Replaced each method with until