Add adaptive changes 2