fixed goodrich stuff still untested