Slightly faster working version,

pre-fiducials