Frequent updates break existing features

Other EPIK issues: