modified sources for WptToolkit