pre thornquist commit