Ported Concern from AS, rewrote ES member

Updated fixtures