Updates from PR