alot of changes to fiducial and cups