Rebased to remove some sensitive data