further adjustments on architecture