Adaptivity patch 1