Reworked some of the ComputeEwa indexing