Added more on french, made some more efficient