Updated to EMEnergy development code