updates to the user classes and asserts