Rohit: Updated Dist with latest changes