Forgot to merge new files from pre5.