implemented the new model and other things