So should I update this PR or should I close it for now?