Major hack of performance models to get them to behave. Will clean up later.