Fix main reference and name
Revert back to non-me marked