Update to ep17