changed model and modify v0.3