architecture adjustments