Updates to new side-effect returned paradigm