Added slight more optimised EPA6v2.