Forgot to add new files from 3.8