Replaced code with the pre TFA code. The old code base is tagged
as post-sopher