modernize

same PR as before on eac