Made EPIC changes