Added new path system, fixed undefined