FAJoin changes..committing on behalf of Jyothi
All bugs arising because of this - responsibility - Jyothi