Update for functions only version.