Standard Model Nucleon EDM revisited