fix a bug and my part is finished