Added Adaptive Mode