Finish part3 of task05