initial third lecture
fixed merge issue