More edits for EVEAI and base pocos