improved c-d geometry