Changed the demo a bit, while doing it changing the API of the modulerr also