adding EE compatibility