+changed model and some tests