Some update in all_calculate files