I dont think we need to loop here anymore