Adds to #45