implement looping on new code base
merge remote