updated file feature2 from feature-3 branch