Updated some part