Improves generation speed
Improves target, path management