Updated code to include no-adaptation here.