#11 Added some asserts