Fixed for loop
merged and chages