Now with an angle => arrow algorithm & oops correction.