ENH: Lock detected fiducials