changes to fit internal requirements