refactoring, fixed D key.