Updating to master spec.