Add a more efficient EPI
Comment out legacy code