Fix track intersection on targets
Adjust the geometry a little bit (six layers)