adding Paul and franks changes