assign1 update by 江鈺云