getting it all up to date