convert to use newer asserts