changes per github issue comments