DB merge with Risse's work.