Finished Rework of DA's

- anything should be fine and clean now ;)