Renamed dslab2 -> dslab3
Resolved merge conflicts