some further adjustments