updated from more current files