Improvements to adaptation