More save work + including toposort and save interception