added lab2 version 2