Added way point boundaries