cleaned up thurgood calls and added error handling