lab2&3 added