Version 2 adaptation