removed loop, added direct paths