nick O: Updated to track changes in thundr