Re-align the architecture based on last UC update