A few tweaks, when user submits we need to clear exisiting loops, like we had before