Rescale and Limit Issues partially addressed