3rd branch ubuntu change