Update upmaster() to perform only the necessary bits of work instead of assuming it needs to do everything