modifs almost done