Added more loops for all variables