Feature4_May2025_OP1_opt