Stop ignoring the README
Improve notation
Re-add a rewritten extra function