done resume & change models structure