Minor changes V1.2