Update for new loop system