Updated for more accurate pathing