Loop is now recursive
Fixed merge issue