Small changes to network and extraction