DZMS
Some minor changes