Unify dr

I await your suggestions...

Cheers,
-Aaron