added more asserts