add features from gdgx master