pulled ej only
merged ejonly