adding in more asserts