AMR_few_improvments