First CG lab & some changes