Changes as per Yalcin's feedback