reviewed changes by mje