1.71 - More refactoring

Small changes in eb and newID