Removed prefixes of E and A
Updated for prefix removal