updates to fix gooch bugg