[lab3_asad] merging with lab3