Restored dff conversion
Bug fixes