Initial D edit 2