EP seems to be removed in v4.1, correct? In v4 it was take both option 1 and 2.