updates needed per restructure