D 2.0

Bug fixed