making adaptive optional