added TSF issue 2