overrideing Edgars Commit