oops, i should have done this in a separate PR