@robdelaney Does this look right?