copied changes to undeprecated dtd driver