EP17 SIMPLIFICATION

EP17 SIMPLIFICATION