updates, restructure