Several amelioration added.