more externalization changes