dwsd

Some changes