Updates to #89