architecture adaptions to previous changes