Now that it does work, want to revise this PR?