Working version with 2 x EPU support