Change in adapt_data are incorrect. Reverting till a proper solution is found.