diff to curlymoo's upstream