more PR changes