Restoring more changes