Added full pathing logic