revision 2 from epad