many changes regarding assertions