@jeffersongirao - thanks for filling us in on the EAP version.  We should make a decision soon and make things consistent.