Update to a simplified version.