Updated tails and loops