pull request testing + franks changes