**bump**  @henrikhodne I can revert the `rand` bits if you like.  Any other feedback?