massive improvement to #10