2nd change from dandydon

I think it is done