improved assertions
improved assertions
.