Fix issues till section 3