some of the last modifs