2025.05.08_PR_simplification_FINAL