changed to make easier to measure.  more parts.  Z cal tests too