EHO-330 should move to customize