add other models content and refactor the task_step2