fixed some part