adjustments for changed Logic