JAL-2541 revised cut with features (work in progress)