consolidated loops after talking to Christian