adaptivity added