lab6 without challenge 2
lab6 after merged