added a few more assertions