adding eid and and mirroring