lap7(update master)