added function fn
Merge branch 'Tamdi'