Improve drh
Improve spec