Further updates to #73