The implementation now follows the paper...