Added asserts
more asserts