A few commits for EAP