Included Top Rank Join Changes and Neethu's Driver changes