lap6(update master)