Added terms looping